From a4338f903185cd53eacb161394c56b768a6f9f2a Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Thu, 4 Dec 2014 19:26:55 +0000 Subject: [PATCH] xen/arm: Correct the opcode for BUG_INSTR on arm32 A 0 was forgotten when the arm32 BUG instruction opcode has been added in commit 3e802c6ca1fb9a9549258c2855a57cad483f3cbd "xen/arm: Correctly support WARN_ON". This will result to use a valid instruction (mcreq 0, 3, r0, cr15, cr0, {7}), and inhibit usage of BUG/WARN_ON and co. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/arm32/bug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/asm-arm/arm32/bug.h b/xen/include/asm-arm/arm32/bug.h index 155b420283..3e66f35969 100644 --- a/xen/include/asm-arm/arm32/bug.h +++ b/xen/include/asm-arm/arm32/bug.h @@ -6,7 +6,7 @@ /* ARMv7 provides a list of undefined opcode (see A8.8.247 DDI 0406C.b) * Use one them encoding A1 to go in exception mode */ -#define BUG_OPCODE 0xe7f00f0 +#define BUG_OPCODE 0xe7f000f0 #define BUG_INSTR ".word " __stringify(BUG_OPCODE) -- 2.30.2